Move some instructions around on the filter caller