Shape code cleanup.