Changes according to feedback from @puentesarrin and @jcarlosgarcia. Refs #407.