Additional R16B01 compatibility changes.

change macro strategy.