Massage "dumb" language. Re-fixes #1