I've got a data form I developed under Snow Leopard, that has NSTextField boxes alongside NSComboBox fields, and this looked fine under Snow Leopard, but now in Lion, they're drawn slightly differently. I also have some NSComboBox fields with a bordered button, and some with an unordered button, and these don't match, either (though the bordered button NSComboBox looks close to the NSTextField, though it's not a match, either.
How can I get everything to harmoniously match? I'd be happy to get an NSTextField to autocomplete like a combo box, since I hide the button anyway.
Non-Bordered NSComboBox left, NSTextField right (different top edge):

Bordered NSComboBox left,NSTextField` right (different heights):
