Using a more sane extraction method.

(Old method was left over from wanting to extract the non-numeric parts too.)