More amperstyle fixes