The public-facing API has a (valid) protection against NULL caps. We can just directly remove it. Part-of: <!515>