Review: Avoid the ternary operator and remove redundant safety when saving base security_* functions