Refactored so #96 works when minified.