Yet another pass at decoders, cdls, etc.