I talked with Carrie, and we're back to amicably dating. We're both free to bail from the relationship at any point.
Thinking about code rewrites pushed me to re-eval some C code I wrote a few years back (suedit, which is a program that allows non-root users to edit files and it enforces RCS use). It's a glorified shell script, but it's quite functional; all I did was clean up the naming scheme, and add support for users to specify their own editor via an environment variable (which is security ok, as root privileges have been dropped at that point).
This mucking around with C reminded me of a post by Linus, where he kicks Andrea Arcangeli for being careless with his #ifdefs. ;)