more places where 'push' should be avoided