More work on source patch reduction