Refactor height/width animators to be more in line with conventional
animator patterns