Simplify now that float-time etc. are built-in