Simplify some constructs