Is there by chance an Intellij formatter I can apply to avoid these nits?  Also this should be fixed in my updated patch.