[MONDRIAN-1254] Cleanup suggested by Luc.