Fix SHA-3(Keccak) issue with HD4000 (issue #191) and reorder macro