After staring at regex and Google search results for long long periods I tracked down / wrote a useful splitter that allows removal of comments from source but keeps the comments for future use. Comments are then also split into assignment header and not