typechecking compositions of sql queries

Given

def insert2(name: String, age: Option[Short]): ConnectionIO[Person] =
  for {
    _  <- sql"insert into person (name, age) values ($name, $age)".update.run
    id <- sql"select lastval()".query[Long].unique
    p  <- sql"select id, name, age from person where id = $id".query[Person].unique
  } yield p

we can typecheck this operation if we factor it as:

def q1(name: String, age: Option[Short]) = 
  sql"insert into person (name, age) values ($name, $age)".update
val q2 = sql"select lastval()".query[Long]
def q3(id: Long) = sql"select id, name, age from person where id = $id".query[Person]

def insert2refactored(name: String, age: Option[Short]): ConnectionIO[Person] =
  for {
    _  <- q1(name, age).run
    id <- q2.unique
    p  <- q3(id).unique
  } yield p

and test with

check(q1("",None))
check(q2)
check(q3(0))

but this is yucky and kills the convenience of the for comprehension.

Given the appropriate Arbitrary instances or whatever, would it be possible to compose the pieces of insert2 in such a way that insert2 can be typechecked directly, without factoring out and assigning names to the component queries?

Start with the inline insert2 composition and compare it with the q1, q2, and q3 refactoring. Run the shown check(q1("", None)), check(q2), and check(q3(0)) examples to understand the current typechecking approach. Done means determining whether the original for-comprehension can be typechecked directly without naming its component queries.