A bit of cleaning up for border cases.