Fix: Make sure semi flags return statements without a semicolon

Fixes #616