Re-add numberRegex, but support Numbers as well.