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:402fceaa0d83197b75136593a176bd15c741b88c

darcs-hash:e0af82a4e6b3466ee0fb75ec9c40a0185a31a706

darcs-hash:2693db936af6bc29cb194bfc5fbcf1b63851c4a5

darcs-hash:24000f6e7e2527f8e6404ebab12ce1a5466bea58

darcs-hash:b4c937cf7a063974ba197f6bfc370ef970f683ef