Changes from lacheck and style-checker.rb