Rename standalone context manager, simplify arguments