Update System.s files, resolves #1.