Rebased assistants (fixes #252)