Bugfix for freeVariables and bootstrap injection order.