More hacks on the scpi-parser to help with cross/host builds