Consistently use \varphi for angle variable.