Fix a brain fart and simplify mpd's tree