Moved Def/WhileLines to use new block format