Put module class methods in their place
Merge pull request #1804 from elzj/queue_changes

Another small fix for 4078 (part 2)