This changes the API of this function.  The correct way to go about this is to deprecate this one and have a new function set up to replace it.  Or, have a kwarg defaulting to False to indicate whether to return the codes as well.