Based on David Van Horn's suggestion. Also, make both `author' and `authorinfo' work (even when mixed).
svn: r15569