Remove unnecessary braces around dereference operations
Replace SKI and SPKI defines with sizeof