Minor waxpbyTask update.
First cut at mapper and task registration updates.