[#2068] Remove remnant of formalchemy. And some tidying.