Verify still working. Minor cleanups.