Tried to improve some inference logic.  It doesn't appear to have helped