branches/impl-build_system (refs #613): Refactor a check