Make Joe's changes not error out at least.  Looks very strange...