add fixReturnType option and improve useShortcutFunctions