Tweaks to use the singular form of hours/minutes/seconds for consistency.