Fix typo with Alternate Signal Layout, and some additional cleanup

Change-Id: Ieb1e03de152c0a66830ec52ad59e5929c3287b99