Can't we just stick this in `when Messages::CheckInterval` case?