Parser fixes and refactoring for Omnimech loading