Cleanup before addressing the "equality instead of assignment" problem