Merge "Move safe_body() into specific class"