Hunk staging improvements. Have into account context lines.