Minor modifications for consistency.