Make Expect initialization clearer