MP1-4247 : Make the code clearer.