Simplify the auto-return system. Fixes #72