Various cleanups prefering lambda to bind