More dictionary contructions replaced.