Switched braces to be handled by blocks not functions
Removed brace-handling from IfStatements.