Made more statements accept generic expressions