Minor output changes for pswaps and top-batch.