Use more consistent types.