Few small DSL cleanups.