Add yield blocks. Various other improvements.