Fix Del key processing + minor cleanup.