More payment details refactoring (WIP).