Various cleanup in constellation.rs.
auto merge of #4019 : Ms2ger/servo/constellation, r=mbrubeck