Better int and float parsing in collection matching.