Fix infinite loop of death.

Turns out travis CI was right about my PR causing nothing to run.

review by @eed3si9n and sorry for not having tested that last minute refactoring beyond compiling!