Cleanup suggested by @raggi.