Clean up suggestions before passing to omnifunc

We now mostly work! No idea how to get layout_width, etc.,
but what we DO have is pretty good, I think...
Fix checkstyle warnings