Refs #3232, tweaks