Clean up, and more closer to tsutsui's luna68k patch:
  https://gist.github.com/tsutsui/7805467/