Minor changes.

- Changed some names up and removed a plan_reset() function that is
never used.