Included codelets using new technique, plus char-for-char output change to match original.