fix more contracts (why didn't we know about listof...)