Minor tweaks for upcoming famiclom work.