I'd prefer it if this stuff was package scoped- once we release public interfaces we won't be able to change them.