Minor moving of todo and improving readability of push_exception