[misc] Improve generic use