Misc small non-user-visible fixes

Some are Unicode vs Str stuff, others are style adjustments, others in unused functions, and so on.

lslopt/lslinliner.py

@@ -18,9 +18,9 @@
 # Expand inlined functions. This could perhaps be made at parse time, but that
 # would obfuscate the source too much.
 
-from lslcommon import nr
+from lslopt.lslcommon import nr
 
-# Statement-level nodes that have at most 1 child and is of type expression
+# Statement-level nodes that have at most 1 child and are of type expression
 SINGLE_OPT_EXPR_CHILD_NODES = frozenset({'DECL', 'EXPR', 'RETURN',
     '@', 'STSW', 'JUMP', ';', 'LAMBDA'})
 

lslopt/lslparse.py

@@ -3007,7 +3007,7 @@ list lazy_list_set(list L, integer i, list v)
         del self.scopestack
 
         if self.enable_inline:
-            import lslinliner
+            from lslopt import lslinliner
             lslinliner.inliner().inline(self.tree, self.symtab)
 
         treesymtab = self.tree, self.symtab