Issue#161: Some small tidyups