A few more small cleanups. All topics (other than RAOR) now run successfully.