Doc cleanup.
Use ? suffix option where appropriate [IMMUTANT-512]