Properly handle layerFX on groups.

Also clean up some whitespace.