Fixed the type expression problem, but it took a while and required a
LOT of reading! Next up: remove an unncessary 'include' that should not
be hard to replace with an 'open'.