Minor code cleanup

[sethm]

While reviewing the code, I came across two minor areas that could use some cleanup.

1. Moved a member assignment that looked like it should happen only once to the outside of a loop.
2. Simplified some assignments in a switch statement.