refs #6449 A bit more wandering around (and probably over-locking)