Sorry, I didn't read closely enough, you are correct.

When I am planning to make the bswap changes they will operate on the value type and not a char* (these are how the intrinsics work), so this will change anyway to val = swizzle(val).