Rebased assistants (fixes #256)