grmbl, forgot to save this
Add missing semicolon
Always use key prefix
Revert 0d8597173d84679e51eb56b62c1a72bad5105de5
Fix test
Fix tests
Fix test
Change bzr legacy
Fix copyright
Remove declarations
Constify