Actually simplified SiteSubsection, remind me to save before I commit?