JVMCBC-15: Simplify Environment.

Change-Id: I05880eaa14aa7301921eb0aa71759596d29e42ff