[HIPIFY] Mostly fix preprocessor-or-template induced issues [ROCm/hip commit: aa05b3d84e]
aa05b3d84e
)