Don't do a separate check for a short write

Minor refactoring in the course of doing legacy/trac#33897 (moved).