Comment code to indicate vC 2.1-specific hacks