Nits: Inconsistent style within the file here.  We use preceding underscore on other utility functions, but trailing underscore here.  Why the difference?  Can we unify?