Refactor standard types.