Improve parsing of numerals
Remove extra analysis attributes
Remove extra analysis attributes
Fix analysis bug