Extracted aff and angular strap specific code