Fixed bug, and explicified (if that's a word) the inline control structures
Travis CI build broke because I once specified you can't use inline control structures