That would be really nice. In the meantime, these changes are fairly trivial to make and get us some forward progress