Better anglebracket support

Change-Id: I31b17e5cc6a2c82341e85222bee8a600ab0b38d5