Contribution Amount Display - Amount is Duplicated for Membership Fee and for Other Amounts

The Confirmation and Thank-you templates display the $amount_level variable value - and this value is populated for two cases where it should not empty:

Case 1: Regular contribution page which includes Other Amount text field (sample contrib page id=1). User enters Other Amount (let's say $15.00).

Result 1: Contribution amount display on Confirm, Thank-you and Receipt is:
Amount: $ 15.00 - 15.00
The 2nd 15.00 is the amount_level. We should make this smarty var be empty for this case (and the templates will then do the right thing).

------------
Case 2: Membership signup page w/o amount block (sample contrib page id=2). User selects a membership type and continues.

Result 2: Contribution amount display on Confirm, Thank-you and Receipt is:
Amount: $ 100.00 - 100.00
The 2nd 100.00 is the amount_level. We should make this smarty var be empty for this case (and the templates will then do the right thing).

NOTE: I did not check the Membership + additional contribution case. Pls check that one as well and fix displays as needed.