Refs #4278 Continue refactoring, removing the function's flag parameter