Minor changes due to Tetris, again.