This makes two functionally similar but helpful improvements in terms of
more clarity and better behavior when circumventing existing codepaths.