Alternative fixes for many-arguments bugs