Substantive changes: corrected margin collapse logic for collapsing through which wasn't necessary.
Changed paths: