diff --git a/src/Cpu/CSRs/MachineStatus.bsv b/src/Cpu/CSRs/MachineStatus.bsv
index d74cbca..ec48739 100644
--- a/src/Cpu/CSRs/MachineStatus.bsv
+++ b/src/Cpu/CSRs/MachineStatus.bsv
@@ -150,8 +150,8 @@ endinstance
 
 interface MachineStatusIfc#(numeric type xlen);
     method Action beginTrap(RVPrivilegeLevel currentPriv);
-    interface Get#(Bit#(xlen)) getMachineStatus;
-    interface Put#(Bit#(xlen)) putMachineStatus;
+    method Bit#(xlen) get;
+    method Action put(Bit#(xlen) newMachineStatus);
 endinterface
 
 module mkMachineStatus#(IsaCfg#(xlen) cfg)(MachineStatusIfc#(xlen))
@@ -172,30 +172,31 @@ module mkMachineStatus#(IsaCfg#(xlen) cfg)(MachineStatusIfc#(xlen))
         mstatus <= mstatus_pack(mstatus_);
     endmethod
 
-    interface Get getMachineStatus = toGet(mstatus);
-    interface Put putMachineStatus;
-        method Action put(Bit#(xlen) newValue);
-            //
-            // Only MPP, MIE, and MIE are writable.
-            //
-            MachineStatus mstatus_ = mstatus_unpack(mstatus);
-            MachineStatus value = mstatus_unpack(newValue);
+    method Bit#(xlen) get;
+        return mstatus;
+    endmethod
 
-            if (cfg.extS) begin
-                mstatus_.mpp = value.mpp;
-            end else begin
-                // Supervisor mode not supported, ensure only USER and MACHINE
-                // mode are set in MPP.
-                RVPrivilegeLevel requestedMPP = value.mpp;
-                if (requestedMPP == priv_USER || requestedMPP == priv_MACHINE) begin
-                    mstatus_.mpp = requestedMPP;
-                end
+    method Action put(Bit#(xlen) newMachineStatus);
+        //
+        // Only MPP, MIE, and MIE are writable.
+        //
+        MachineStatus mstatus_ = mstatus_unpack(mstatus);
+        MachineStatus value = mstatus_unpack(newMachineStatus);
+
+        if (cfg.extS) begin
+            mstatus_.mpp = value.mpp;
+        end else begin
+            // Supervisor mode not supported, ensure only USER and MACHINE
+            // mode are set in MPP.
+            RVPrivilegeLevel requestedMPP = value.mpp;
+            if (requestedMPP == priv_USER || requestedMPP == priv_MACHINE) begin
+                mstatus_.mpp = requestedMPP;
             end
+        end
 
-            mstatus_.mpie = value.mpie;
-            mstatus_.mie  = value.mie;
+        mstatus_.mpie = value.mpie;
+        mstatus_.mie  = value.mie;
 
-            mstatus <= mstatus_pack(mstatus_);
-        endmethod
-    endinterface
+        mstatus <= mstatus_pack(mstatus_);
+    endmethod
 endmodule
diff --git a/src/Cpu/CsrFile.bsv b/src/Cpu/CsrFile.bsv
index a3c4a9a..fda8a67 100644
--- a/src/Cpu/CsrFile.bsv
+++ b/src/Cpu/CsrFile.bsv
@@ -180,7 +180,7 @@ module mkCsrFile#(IsaCfg#(xlen) cfg)(CsrFileIfc#(xlen))
                     csr_MIDELEG:    result.value = mideleg;
                     csr_MEDELEG:    result.value = medeleg;
 
-                    csr_MSTATUS:    result.value <- mstatus.getMachineStatus.get;
+                    csr_MSTATUS:    result.value = mstatus.get;
 
                     csr_MCYCLE, csr_CYCLE: begin
                                     result.value = mcycle;
@@ -226,7 +226,7 @@ module mkCsrFile#(IsaCfg#(xlen) cfg)(CsrFileIfc#(xlen))
                         // No-Op
                     end
                     csr_MSCRATCH: mscratch      <= value;
-                    csr_MSTATUS:  mstatus.putMachineStatus.put(value);
+                    csr_MSTATUS:  mstatus.put(value);
                     csr_MTVAL:    mtval         <= value;
                     csr_MTVEC:    mtvec         <= value;
                     csr_MIE:      mie           <= value;