Generalize to avoid more inline comment cases
Handle imports