Cleaned up rules to eliminate sp_tree=None special case