Modernize and clean up 1040 Schedule D logic