fix some more uses of the forward keyword

23 jobs for 186-improve-c in 33 minutes and 45 seconds (queued for 4 seconds)