Prep for merge of executor-redirect

Couple minor things to clean up before merging executor-redirect to
master.