Merge pull request #1537 from ethomson/merge_warning_cleanup

puns are not funny; type punning especially so
braces