expand inside blocks before adding defctx #274