Minor tidyness improvements.