Fix some RSpec 3.x breakage.