Consume new location module in main parser

Additional lint fixes