Minor code clean up and migration of wxGTK from RDEPEND to DEPEND.