[CFLAA] More cleanup for MSVC

Remove more initializer lists, etc.