Simplify parsing of commands in psci. Correct some indentation issues.