Minor cleanup of load-simulator