remove unneeded block in function parse
rejig a bit of block handling