More work on checking if variables are unused.