MFC r327140: Fix rule number truncation, use uint16_t type to specify rulenum. Also sort variable declartions by size. PR: 224555