Whoops. Positional arguments are bad. (I will probably split the entity and subentity types out, soon.)