Love it!  My only request is to use a switch statement below, for readability...otherwise, this is a solid change.