Update code for Yosemite - this meant changing rawValue() to rawValue and fromRaw to a constructor.