Remove redundant &0xffs and fix up a typo for single-byte decodes