Gr cosmetic fixes

some extract-method refactorings i did while grokking how stomp parsed its params.