Few small DSL cleanups