Attempt to be a bit better at default hunks