Tiny more cleanup and polish.