[jhc] darcs patch: fix bug where class rules were not gener... (and 1 more)