Simplify passthrough logic