Only slice arguments when necessary - fixes #239