Correctly handle shorthand byte values (see #6345)