Re-arranged binding and scope bit masks and options.