Fix Clang static analysis errors

This covers #459 and #460.
I don't have an opinion either way. You know the code best.

I would just suggest, if we were to keep the pos offset, to keep the last store in the code and just quiet the warning with a macro. This would give us the best bang for the buck of removing the warning but retaining the info of the last skip amount in case code is ever added/required after that.

I thought of commenting the last store, btw, but I think this is likely to be overlooked if someone needs that value in the future. Plus I hate checking in commented code.