Further simplifications

Removing more code that only makes sense for C-like languages.