fix more inconsistent braces
i think this is all the UPPERCASE HEX LITERALS, yuck.