Precisely.  I'll add a comment indicating that it needs to stay typeof.