Not so minimalistic: refactoring out compatability stuff w/ foundation.