How about this: 9699ce8 (I'll to the table-driven tests after your thoughts on this)