2014.7

Misc cleanups while I was looking into a reported issue with syndics.
@rallytime You are correct, I've pushed 6612aa8 to revert this one