Fix a bug, lighten up on argument types.