Bring interface and trait back in line