Added support for a nicer switch-like expr and C++ style comments