No need to scan for dates twice

Just make the second date optional.