Fixes mssy cde and superfluous longwindedness