Simplified macros and switched `time` crate