Refs #80 - Simplify validation code.