Formatting/APEcs fixes.