Cleaned up EVT parsing code a little.