Remove the explicit use of state functions.
Add the extra arguments to actions.py required by restructuring.