Further refactoring of T_FINANCE.