Removal of JVET-N macros.