GENERAL RULE: Methods with trailing underscore do in place modifications of the
object, while methods without trailing underscore do a copy (and leave
the original object unchanged).

Also fixed some headers and unit tests + cosmetic changes.