Jade-ification, general cleanup.

Have a look. Let me know if I'm just wasting time (mine and/or yours). I can do the rest of these pretty quickly if this is OK with you all... Thanks!