refactored weird (erroneous?) parameter-pack expansion

Signed-off-by: K-ballo <k@fusionfenix.com>