Fixes for which blocks are marked as unused initially, and assertion fix (had assignment in it)!