Allow adding and using a key, remove PHP cruft.