Maint: Expand options into separate variables