Minor fixes: Remove unused import, add default for encrypted-ephemerals, whitespace fix.