Simplify goals helper spec

Just a simple refactoring I dug out while pruning git branches.