Clean up quoting, better flock() stub.