More consistent variable names between interlaced and non-interlaced reading.
More strict warnings.