Make optional setup steps explicit