Small cleanups; give up on FIXME