I think this change is correct/less confusing, but Jake can comment.  Thor also has a check on the minimum record size - which makes sense if we ever switch over to a more dynamic maximum record size.