This should be done after initial release, unless doing so is simple enough and makes the code smaller to begin with.