Simplify on demand logic a bit