cleanup some unneeded `progn`s