Reduced amount of swizzling and DSL changes.