Working through comments. Refs #29