Fix wrong imenu generic expression, add one more regexp to match 'x = function(...)' definitions