Better env expansion.