fixes #114, fixes #119 - Refactored some of the logic around evaluating benchmark build order steps