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