Consolidate magic_byte. Add test.