Refactor fix_pusher.cpp and fix_popper.cpp

[colding]

They are rather ugly as is, so if they can be cleaned up (if practical) then we must do so.