Cleanup: Allow long assignments