Merge "Cleaning up {above, left}_block_mode functions."