Two bugs for Newbie Devs

[ninetydegrees]

http://bugs.dwscoalition.org/show_bug.cgi?id=4151: easy fix is literally changing one line in core2.s2 as explained in the comments. How's that for a non-scary style thing?

http://bugs.dwscoalition.org/show_bug.cgi?id=5160: cleanup! If you're into time-travelling removing a few *very* old lines of code this one's for you.