Issue #2255375 by juliangb: Improve coding style.