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