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