Backport lazy and DSL superclass to 11-stable