Minor de-clunkification