Further improve (aka fix) classifier handling.