Use LOC_* constants for locations. Clean up some ARB_* constants.