commit of verification long standing branch

This is kind of hackish. But we need to change ListBuiltin anyway, so this code will change.