handle pure-local stuff more cleanly