Tidied up the definition of simpl(.).