Only other suggestion is handling the case where `infix` or`related` is missing--if that every happens.