Begin tidying Mantle internals.