Car wax. Sounds silly, but it works. The good wax stuff, smells like crayons with a hint of motor oil. Not the cheapo cleaner waxes, they don't have enough real wax in them.
Scrub in with a tooth brush, let dry, wipe off, repeat. Do it about every two years on my express finished guns, really does the trick.