Changed to 'xkeyval' and 'kvoptions-patch' for key-values.