Some small clean-ups.

@tseaver The parent class (Folder) ensures this is the case I believe.