Progress on transfer fields and some general cleanup for future optimizations.