#53 Apply branch expression to relevant classes