=par more shapeless strip-down and comment cleanup

Follow up to #15867.
Merge pull request #15876 from spray/w/strip-down-shapeless

=par more shapeless strip-down and comment cleanup