Condensed if clauses in data loader
refs #623