Change a couple of things around to hopefully make it easier to use the
interface from different languages.