A bug which would have affected amazon payments when payment_method is set.

Silence some warnings.

Change-Id: Ie51f015adefd4a4b03f8aae19ded3137b48fd437
Fix a crash in recurring

Change-Id: Ifb525f9b464327bf7190f14b7b94f64ec7592fd3