Minor changes due to Tetris.
Minor changes due to Tetris, again.