More minor cleanups post-copyright update.