Move "optional" keyword for params so it doesn't trigger warnings in other gcc versions
Make two declared event-loop handlers non-static & clean up some nop whitespace