DRYed a bunch of code in proposal development. Fixed associated methods in the step definitions.