Make 3rd party tweaks a bit more automagical

This was originally intended for 3.1. Can I get some eyes on it for the 3.2 merge?