Minor enhancements to improve demoability.