Fix suzy container

These changes are required to get susy "container" mixin working.

Still problematic is the following commit: ada938f as that breaks a unit test. That has to be solved differently - however I have no idea how to do that