Such `Int` constants are a bit 2012. Might this be cleaned up at all with value classes (or maybe just regular classes, I doubt this is performance sensitive)?