Fix #313 and add help for expandable directive for #480