Clean up some unnecessary conditionals. Update copyright date.