Consolidate plaquette routines into two places per James's suggestion