More consistency to the source code.