Restrict size of integer types in FST dump
Tweak entity/architecture info for top level FST scopes