Also, add a TODO: in scala 2.10 this should be a value class (extend AnyVal).