Fix off-by-one issues in anal comments (fixes #95 and probably #96)