Simplified time unit conversion (and fixed a couple places that were technically incorrect, but I don't think were possible to hit)