Yep.
The smoking thing was actually what pissed me off most in the movie version they did. The fact that after being brought back to life he decided to quit was completely wrong for the character. His first impulse after screwing the devil out of curing his cancer was to light up a smoke. That act sums up who the character is. Having him not light up doesn't fit at all.

