Some cleaning up of STLC.