Some slight design modifications. Refs #630.