Move skip-vote from global macros to job templates