I'd prefer it if we made these explicit rather than a hash...