Merge pull request #1130 from twitter/ianoc/smallerSplitOff

Some minor changes, cleanup pulled from jco's macro branch
Merge branch 'develop' into ianoc/caseClassTupleConverters