Autospace code cleanup.