Work around two possible issues in XM reader; Fixes dark_lighthouse.xm.