Minor cleanup. Refs #29