Simplify some calls.