Corrections to the custom code specs and cleanup of unresolved expansions in the comments