Fix a problem exposed by my previous commit and noticed by a release-asserts