Refs #315: A bit of housekeeping