Okay; if this is a requirement because of the current API, it would probably be a bad idea to try and jam that change into this commit. Worth thinking about for the future, though.