Simplify sample code.
Merge branch 'rust-servo' into rust-0.9:  Simplify sample code.