Various cleanup in constellation.rs.