Prevent doubles causing issues with inline subject.

Should catch regressions that will cause issues like #1569.