Disable comma initialization (hide it behind #define); update unit tests