Could we not put it into a namespace of its own?