Clean up some stuff, comment initial_action_hack handlers appropriately.