Use new form short comment header
use sentinel constant for readability