Minor changes to prepare for payment API.