Adapted to Corrade and Magnum changes.

More shorter lines (sometimes even longer lines).