Less `_push` and `_pull`

Replace the push, execute, pull idiom in a few places.