Clean up slot options PSI tree some.