Misc code clean-up around membership/contribution forms

Most of these commits are pretty uncontroversial and easy to read. As I was addressing issues related to this form during the sprint, I rewrote some of this code to clean it up and make it more readable.