Structure cleanup in supporttools.