Fix how prefix push/pops around modes.

This fixes 60.water.