Allow module targets to be specified using actual module names.
Cleanup/organize SYB optimization