some misc cleanup on Completable and Term