Remove some more %D remains here and there.
m4.1: Remove some unneeded arguments to .Nm