Fix for remote PassesWithin under jdk 1.5
Handle - and _ character in step macro parameter names
comments