Fixed inconsistencies in handling is-composing

Ignore-this: 867de4134f7deb1ab192515f199ddaef

darcs-hash:20091116131643-b22ec-7a67d8cc48b127ceee07f2c1522809014d316c65