get rid of defclass-star dependency by expanding a few macros inline and keeping their original in commented out form

darcs-hash:01341284080b67a14bb7f203124e3abba8b500c3

darcs-hash:8856df4ad887b05b98fd69240cb683f254df9442

darcs-hash:0f25a64d6a308afd9780cb02dc8f6148e1eff214

darcs-hash:53b4f18b77072a0fe7cbd353e7828ac256d0a401

darcs-hash:a807eb1a88052c0762207a123f198ce05dc2f060

darcs-hash:68ce23ade7a83a7944ba09df8db2c190544e6628

darcs-hash:fde9e667d0605a919c2582aabf002df7e78cf69b

darcs-hash:12d8dc8ee83aabd779024838ffa3943a97f4c452

darcs-hash:a5f1fe96255eb79ecaa81461e4f05536dbde3a38

darcs-hash:3560d80a26d740de09fcf778f8df24b0e8049299

darcs-hash:883999cc9daa340fea07da49af3703d421e1eb8a

darcs-hash:7a8d7f9819d6a54b3b745b1c7d53a62b751927a4

darcs-hash:2693db936af6bc29cb194bfc5fbcf1b63851c4a5

darcs-hash:ac7c5edc0e14056f00a304d3f6a9c7a5a4a31caa

darcs-hash:24000f6e7e2527f8e6404ebab12ce1a5466bea58

darcs-hash:b4c937cf7a063974ba197f6bfc370ef970f683ef