Mainly non-visible angular cleanups.