Further refactoring of RPC transaction population