Simplify, now that $now exists