Clean up TokenHasReadWriteScope slightly