Remove superfluous thens

`then` is only needed on single-line `if/then` or `when` statements

The only other change is in lib/rubygems/compatibility.rb line 23 where I replaced an inline do/end with {}