Fix forw so it respects the -form switch again for non-digests.