Fix define command removal

Make it so defines can be used using the setup aufdemrand created in an
earlier commit.
Also update the define command to a more modern command setup.