Unbreak particularly tricky hex constants