Cleanup some code.
auto merge of #1023 : Ms2ger/servo/cleanup, r=jdm