First try at cleaning up FKind handling
Ignore auto