2 small fixes

The first one fixes up some bad type inference around Enum values that happened after some of Peter's more recent commits.  The second one restricts static methods from consideration when determining which members map to columns.