Allow None aug_traj in Demonstration
Fix minor runtime bugs in registration module