Remove unnecessary IIFEs, Closes GH-4