Issue #30: Cleaner optional username in SCP deploy.