Fixes some template issues that could lead to code not compiling when it otherwise should. PiperOrigin-RevId: 308809964 Change-Id: I9f2f9d4aff5f1a9cb967fb705a86fd7f49114f7a