Restructured a bit for clarity, also saving one byte. :-)
Updated Lysator.