If the single line one delegates to the batch one it should solve most of them.