Minor fixes on DSLs and mock generation (cleaner fluency)