Converting indentation...
Committing a good suggestion before I forget. Should resubmit later
today.
A version without the number check; it's not necessary. Commented out for now in case I change my mind.