--- a/core.lua	Mon Aug 27 03:27:14 2012 -0400
+++ b/core.lua	Wed Aug 29 22:20:51 2012 -0400
@@ -113,8 +113,8 @@
 
 
 ------ Constants
-local RAID_ROSTER_UPDATE_EVENT =
-	(select(4,GetBuildInfo()) >= 50000) and 'GROUP_ROSTER_UPDATE' or 'RAID_ROSTER_UPDATE'
+local RAID_ROSTER_UPDATE_EVENT = 'GROUP_ROSTER_UPDATE'
+	--(select(4,GetBuildInfo()) >= 50000) and 'GROUP_ROSTER_UPDATE' or 'RAID_ROSTER_UPDATE'
 local option_defaults = { profile = {
 	--['datarev'] = 20,    -- cheating, this isn't actually an option
 	['popup_on_join'] = true,
@@ -522,7 +522,7 @@
 	name = addon.instance_abbrev[name] or name
 	if typeof == "none" then return name, MAX_RAID_MEMBERS end
 	-- diffstr is "5 Player", "10 Player (Heroic)", etc.  ugh.
-	if GetLFGMode() and (GetLFGModeType() == 'raid') then
+	if GetLFGMode(LE_LFG_CATEGORY_RF) then
 		t,r = 'LFR', 25
 	elseif diffcode == 1 then
 		if IsInRaid() then
@@ -1169,7 +1169,7 @@
 	addon:SetDefaultModulePrototype(prototype)
 
 	local err = [[Module '%s' cannot register itself because it failed a required condition: '%s']]
-	function addon:ConstrainedNewModule (modname, minrev, mincomm, mindata)
+	function addon:ConstrainedNewModule (modname, minrev, mincomm, mindata, ...)
 		if not addon.author_debug then
 			if minrev and tonumber(minrev) > (tonumber(self.revision) or math.huge) then
 				self:Print(err,modname,
@@ -1187,7 +1187,7 @@
 				return false
 			end]]
 		end
-		return self:NewModule(modname)
+		return self:NewModule(modname,...)
 	end
 end
 
@@ -1453,7 +1453,7 @@
 		if event == "Activate" then
 			-- dispatched from Activate
 			if opts.history_suppress_LFR
-			   and GetLFGMode() and (GetLFGModeType() == 'raid')
+			   and GetLFGMode(LE_LFG_CATEGORY_RF)
 			then
 				_LFR_suppressing = true
 			end