Do some more work on CommandSPDefine.java.