commit: #'fill; move all declarations before statements, for the Visual Studio build