You're probably right; the two blocks you're mentioning were moved from elsewhere in the file.