Support moving only 3 or 6 axes for tool change position

Sam and I thought this was always intended, but it never worked.
This is a better fix for the problem in bug #250