Refs #91 - Reduce nesting in method.