Although it didn't seem to be causing any bugs the global variables in toolchain_util conflicted with some names used elsewhere. Clean that up by adding an S to the array names that didn't already have one.