Rework implementation of cyclic mapping graph traversal. refs #1142 #1158 #1163