Appears to be an off-by-one error when calling `beginning-of-defun-raw` during the second part of moving forward. This patch `1+`s the `(- arg)` to make both methods equivalent. Please do not hesitate to mention anything I may have missed. -----