Also add ones where they are actually used

Helps #2272

Part-of: <!3603>