There's no rush to merge here -- we're nowhere near our next major release. What you're saying is that you want to be done working on this and I understand that but please work with me to get the code and feature in a good, ready to release state because once it is merged I know from experience that you (i.e. you the general you, contributor of a shiny new feature) won't be as interested in fixing tooltip phrasing. 

Regarding style issues -- there are minor pros and cons of various styles but the most important thing is uniformity. When the style is uniform, I can scan a file much easier and generally eyeball the shape of it -- see how the control flows, the exit points, blocks, etc. I'm sorry for the tedious style comments but they are an important part of a healthy codebase.