Minor cleanups, attempts to decode M.java