Did some cleanup for JyNI 2.7-alpha.2.2