and fix the resulting breakage (of not compiling them for some time, that is) also remove the last casts to FiniteDuration