Address some follow up comments.
Merge pull request #938 from brendandburns/exec

Address some follow up comments.