Cleaned up optimist use.