Internalise more vars