Micro-cleanup

Last push of the day.