The refactoring I intended in SCHEMA-139 doesn't cover this part. It's an unfortunte duplication of a (small) bit of code, but seems reasonable