diff --git a/src/meta/maxis_xa.c b/src/meta/maxis_xa.c
index 5c8206d8..65018178 100644
--- a/src/meta/maxis_xa.c
+++ b/src/meta/maxis_xa.c
@@ -1,62 +1,50 @@
 #include "meta.h"
 #include "../util.h"
 
-/* Maxis XA - found in 'Sim City 3000' */
+/* Maxis XA - found in Sim City 3000 (PC) */
 VGMSTREAM * init_vgmstream_maxis_xa(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
     off_t start_offset;
-    int loop_flag;
-	int channel_count;
+    int loop_flag, channel_count, i;
 
     /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("xa",filename_extension(filename))) goto fail;
+    if (!check_extensions(streamFile,"xa"))
+        goto fail;
 
     /* check header */
-    if ((read_32bitBE(0x00,streamFile) != 0x58414900)&& /* "XAI\0" */
-		(read_32bitBE(0x00,streamFile) != 0x58414A00)) /*  "XAJ\0" */
+    if ((read_32bitBE(0x00,streamFile) != 0x58414900) && /* "XAI\0" */
+        (read_32bitBE(0x00,streamFile) != 0x58414A00))   /* "XAJ\0" (some odd song uses this, no apparent diffs) */
         goto fail;
-        
+
     loop_flag = 0;
-    channel_count = read_16bitLE(0xA,streamFile);
-    
-	/* build the VGMSTREAM */
+    channel_count = read_16bitLE(0x0A,streamFile);
+
+    /* build the VGMSTREAM */
     vgmstream = allocate_vgmstream(channel_count,loop_flag);
     if (!vgmstream) goto fail;
 
-	/* fill in the vital statistics */
     start_offset = 0x18;
-	vgmstream->channels = channel_count;
+    vgmstream->channels = channel_count;
     vgmstream->sample_rate = read_32bitLE(0x0C,streamFile);
     vgmstream->coding_type = coding_MAXIS_MT10;
     vgmstream->num_samples = read_32bitLE(0x04,streamFile)/2/channel_count;
 
-    if (loop_flag) {
-        vgmstream->loop_start_sample = 0;
-        vgmstream->loop_end_sample = (read_32bitBE(0x0C,streamFile)-start_offset)/8/channel_count*14;
-    }
-
     vgmstream->layout_type = layout_none;
     vgmstream->meta_type = meta_MAXIS_XA;
 
-    /* open the file for reading */
-    {
-        int i;
-        STREAMFILE * file;
-        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
-        if (!file) goto fail;
-        for (i=0;i<channel_count;i++) {
-            vgmstream->ch[i].streamfile = file;
-            vgmstream->ch[i].channel_start_offset=start_offset+i;
-            vgmstream->ch[i].offset=0;
-        }
+    /* open streams */
+    if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
+        goto fail;
+
+    /* fix channel offsets as needed by the codec (could be simplified) */
+    for (i = 0; i < channel_count; i++) {
+        vgmstream->ch[i].channel_start_offset = start_offset+i;
+        vgmstream->ch[i].offset = 0;
     }
 
     return vgmstream;
 
-    /* clean up anything we may have opened */
 fail:
-    if (vgmstream) close_vgmstream(vgmstream);
+    close_vgmstream(vgmstream);
     return NULL;
 }