@nulltoken I would rather this be done as a separate PR (I would rather not modify the behavior of existing public API with this PR). I wouldn't mind if this API was improved (I hinted at this in my PR comments, as well).