Revert various width and height references back to mixin calls