message: Simplify and implement MessageSet interface