Abbreviation inspection for Scala working.
Minor workaround for an occasional 'Method has no parent' problem.
Merge branch 'scala'