dimen.c: simplify
paper.c: guard GNU patch for defaultpapername, and simplify