Non-functional changes for -pedantic