Narrowing security requirements, minor idiomatic updates.