Cleanup: allow more exec overrides; formatting.