More OPTIONS reflections information, and a few cleanups.