Minor cleaning.
Porting fix to the checker.