support naked bind & repeat

BUG=

Review URL: https://codereview.appspot.com/8561043