Be less dumb about parsing fields