Surprisingly painless changes to support data constants in extra quantities