First and possibly final performance improvement post Github Contest.