message: Simplify MessageSet