I'm going to go ahead and try Marvin's Utility for once. The best time to proceed is when 10.5.2 comes out. Eventually, I would need to reinstall everything all over again.