Add better typeof.