fix #19936; minor coding style updates