Refactored local type signature generation (#130)