Start refactoring
Get rid of single-param GET_STRING, part 1

Start by only using GET_STRINGX all around.
Rename GET_STRINGX to GET_STRING
More string sanitation
Formatting cleanup