Slight cleanup.
More cleanup.