r6407: Fix for bugzilla 2623 and 2630: $< and $* are not valid in explicit