casts, consts, and decl order
Merge pull request #69 from asmaloney/more_cleanup

casts, consts, and decl order