Get rid of more coerce cruft (really check in this time :-)
7 files changed