fixes to AddParen in deriv.c
Merge branch '29-cleanup' into 30