Moved digit-only line to end of output.

Simplifies some logic, but most importantly moves tag to last position in output.