Slightly better source organization.