Also fixed unintended masking of $vat variable.
No hackerspace probably needs this, but I just realised that implementing VAT support would be very easy, so why not.