Restructure credit transaction decomposition (solves issue #689)