Cleaning up code a bit and adjusting EmuQL's handling of &