Issue #2665152 by alexpott, Andrej Galuf, tfranz, longwave, andypost, jsimonis, bojanz: Simplify module form structure and fix bugs when Suhosin is used