Remove remaining unnecessary 'volatile' qualifiers