Added EnyBy and EndBy1

Also, hadn't fully renamed Sep to SepBy and Sep1 to SepBy1 earlier -
done properly now