Interface reorg to assist partial application