Simplify locks
Remove paren if callback not specified