Cleanup of some of the common model code.  Found during code review, see #56.