Fix: Make generate-implementation independent of preprocess#234

htilly merged 2 commits intomasterhtilly/SlackONOS:masterfrom

develophtilly/SlackONOS:developCopy head branch name to clipboard