Changed the pattern to include for embedded expressions from $self to just #block_innards