Remove documented trickery that's unlikely to remain (or be needed).