Moving things around
Save and restore.
Usage checks and test cleanups.