Merge pull request #1928 from WalterBright/toJC

JA to JC, JBE to JNC