Cleaned up passing of auxiliary keyword arguments