Cleanup, make forms more robust to overrides