33481: resolve completion clashes and tidy-up SUSE/Mandriva related functions