Update copyright year in fix task and refactor

The default copyright header now reflects the current year. Copyright
headers on existing files will not be affected by this change, only newly
created files. Also, a slight refactor to eliminate unnecessary
branching.