Refactoring expectation builder construction.