Use the new fancy rules from the Makefile.introspection, it makes
the rules prettier and avoids quite a bit of duplication