Thanks everyone.

BTW, Rex Cauldwell's book "Wiring a House" mentions the use of romex in
conduit; i.e. "The wiring inside the conduit can be NM or THHN/THWN..."
He also says "At one time, code limited the number of floors on which a
residence could use NM cable. Code no longer prohibits NM cable in a
residence, regardless of height."

I asked my electrician about this, and he says they are trying to
change the code on romex (probably local code), but haven't done it
yet.

I'll be on the safe side and replace the romex. Thanks again.