Slight clean ups in preparation for the sidebar footprints.