Refactor: replace ifdef JP macro