Merge usage of argument/parameter and markup fixes from 3.2.