Correctly handle trailing hunks
Correctly handle internal contexts that are short