Various cleanups, mostly in reflector