Minor cleanup and consistency changes.