Tidy up DEVLOCK/UNLOCK to have consistent use of the pstate variable without needing brace level match.