Partial revert to #3116

Partial revert to #3116.

1. Useless whitespace changes.
2. Useless handling of ``immutable`` and ``shared`` types.
3. Erroneous mangling of ``shared`` -> ``volatile``