cleanup: mostly override annotations and try final wrappers around locks