Move pre-handler to more consistent position.