Can't see how mysqld_safe can work with current setup, so make it look
in $pkglibdir/mysql too.

Other cleanups.