Requested minor cleanups.