Clean up bnat-simulator a bit