Refs #9358.  Refactor continues.