More code cleanup and new alignment check calls.