Add environment inheritance, move runner.h inclusion.