Flush out association between payment and its method.

Change-Id: I7ae6a6071ad9959eacb48bda75061e58236e674f