Must be more intelligent about boolean arguments