Address code review feedback regarding UINT, break, and ExpectedAttribute.
Merge pull request #48 from rseanhall/feat4161

Address code review feedback on 4161