Bugfix: pretty printing numeric constants properly; defined vars are
still buggy