This should be a separate commit. I did a few cleanup things regarding this, but I don't want this change to make a bunch of modifications to String/Id/Bool/Int, which the change you are proposing would require.