Fix for tab-completing arguments. Closes #1261