I should note that the capability stuff was new as part of the upstream merge I pulled in (I took a large chunk of work from you guys at once - bad practice) so likely while these are hanging around.