Cleaned-up evaluation used for ICSE

@mkit