SourceEnvi now longer passed to BuildEnvi's constructor