[TASK] Clean up header size value selection using v:or