Cleanup FIXUP code by collapsing copy-pasta down and removing cruft
Cleanup FIXUP code by collapsing copy-pasta down and removing cruft

joncampbell123/doslib,joncampbell123/doslib,joncampbell123/doslib,joncampbell123/doslib,joncampbell123/doslib,joncampbell123/doslib