Summary: Removing two buggy methods that should not be used, but ended up being used due to a re-organization in the class hierarchy.
Reviewed-by: jmasa, ysr, kamg, coleenp

Summary: An expansion by 0 bytes was not anticipated when the assertion was composed.
Reviewed-by: jjh, jcoomes, apetrusenko