Cleanup/reorder definitions.