Resolve nitpicks.