Code cleanup.
Fixes to alignment intersection.