Some minor cleanups based on feedback.