2014.7

Misc cleanups while I was looking into a reported issue with syndics.