Cleaning up the pre/post command stuff.