Thanks for the confirmation, guys.
Indeed, tonight, it took me only about 30 minutes to get it apart and back together. Still required a few solid whacks with the mallet (rubber, yes :-)) to get the barrel off and back on, but I was able to get it done because I kind of knew what I was doing. Still a little worried about whacking the (plastic) frame, but I guess it's made for that...
The MSH is still a pain because of the need to get the hammer and hammer strut into the right position. Getting easier, though.
Anyway, thanks again!