More cleanups and small improvements (e.g. usage of wrappers).