Move the action to the outer question object

This is a bit more question independant, and more expressive.