Cleanup for flanker

Some small cleanup I did while hand-testing Flanker.