Rewire merchant trading!
Minor code refactoring in BlockListener.