Bit more progress; add support for expanding block "calls" and pulling out their respective names.