OK, I know this might seem a bit strange, but I just got to wondering what things might be like if "Tangled" were set during modern times... I could really see Flynn/Eugene as he was... but once he admitted his name was Eugene, I could see him saying something like, "... but Du can call me Gene." Also, during the last part, when he cuts her hair, I could see a missing "gapfiller," once he comes back to life, before he and Rapunzel return to her parents, where they're wondering about all the hair they're leaving behind:
"What do we do with it now?"
"I don't know, donate it to Locks of Love?"