Refactor use of standard types.