2087: hasRoundCorner flags
2088: move some code