Switch to new subcapture handling code