C99ing ...
Refs: 3763